From d9befed45c0c72a649f49987399e79b9359587c2 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 30 Nov 2012 18:27:41 +0100 Subject: [PATCH] src/doc.c: Fix bug#13034. (Fdocumentation): Re-add handling of function-documentation, accidentally removed in revno:110851. --- src/ChangeLog | 5 +++++ src/doc.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 989f2dd3270..f9ddaf44c1a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-11-30 Juanma Barranquero + + * doc.c (Fdocumentation): Re-add handling of function-documentation, + accidentally removed in revno:110851 (bug#13034). + 2012-11-29 Dmitry Antipov * xdisp.c (window_outdated): Remove eassert since it hits diff --git a/src/doc.c b/src/doc.c index 1d3d1e64442..76008295add 100644 --- a/src/doc.c +++ b/src/doc.c @@ -338,6 +338,14 @@ string is passed through `substitute-command-keys'. */) doc = Qnil; + if (SYMBOLP (function)) + { + Lisp_Object tem = Fget (function, Qfunction_documentation); + if (!NILP (tem)) + return Fdocumentation_property (function, Qfunction_documentation, + raw); + } + fun = Findirect_function (function, Qnil); if (CONSP (fun) && EQ (XCAR (fun), Qmacro)) fun = XCDR (fun); -- 2.30.2